* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.

diff --git a/src/xdisp.c b/src/xdisp.c
index 6173ef4ce741679c6167760a2bbf3a294a3fabb9..a3bdcbdf4c684bae4b1c7ab4c29685faa3975090 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3166,8 +3166,6 @@ compute_display_string_pos (struct text_pos *position,
 
   *disp_prop_p = 1;
 
-  *disp_prop_p = 1;
-
   if (charpos >= eob
       /* We don't support display properties whose values are strings
         that have display string properties.  */